Clip when drawing the cursor. This prevents bits of a selectable label

2004-11-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose):
	Clip when drawing the cursor. This prevents bits of a
	selectable label leaking out from underneath the resize
	grip in a statusbar.  (#73359)

diff --git a/ChangeLog b/ChangeLog
index c6d6a8c0dcd4ff4df7ed3f7919c2a3d378df341d..59907ad3a227bdfbb643c1e3fafac6864b6d9939 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose): 
+       Clip when drawing the cursor. This prevents bits of a
+       selectable label leaking out from underneath the resize
+       grip in a statusbar.  (#73359)
+
        * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
        get reasonable allocations for the statusbar and its
        children.  (#73359)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c6d6a8c0dcd4ff4df7ed3f7919c2a3d378df341d..59907ad3a227bdfbb643c1e3fafac6864b6d9939 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose): 
+       Clip when drawing the cursor. This prevents bits of a
+       selectable label leaking out from underneath the resize
+       grip in a statusbar.  (#73359)
+
        * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
        get reasonable allocations for the statusbar and its
        children.  (#73359)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c6d6a8c0dcd4ff4df7ed3f7919c2a3d378df341d..59907ad3a227bdfbb643c1e3fafac6864b6d9939 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose): 
+       Clip when drawing the cursor. This prevents bits of a
+       selectable label leaking out from underneath the resize
+       grip in a statusbar.  (#73359)
+
        * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
        get reasonable allocations for the statusbar and its
        children.  (#73359)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c6d6a8c0dcd4ff4df7ed3f7919c2a3d378df341d..59907ad3a227bdfbb643c1e3fafac6864b6d9939 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
 2004-11-09  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtklabel.c (draw_insertion_cursor, gtk_label_expose): 
+       Clip when drawing the cursor. This prevents bits of a
+       selectable label leaking out from underneath the resize
+       grip in a statusbar.  (#73359)
+
        * gtk/gtkstatusbar.c: Apply a patch by Owen Taylor to
        get reasonable allocations for the statusbar and its
        children.  (#73359)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b02b3166f440cab8e1051f8efc8fa8767b7c1b15..5dd6e751d2f14978c7666999d5f8e922554e4644 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1987,7 +1987,7 @@ draw_insertion_cursor (GtkLabel      *label,
   else
     text_dir = GTK_TEXT_DIR_RTL;
 
-  gtk_draw_insertion_cursor (widget, widget->window, NULL,
+  gtk_draw_insertion_cursor (widget, widget->window, &(widget->allocation),
                             cursor_location,
                             is_primary, text_dir, draw_arrow);
 }
@@ -2147,8 +2147,9 @@ gtk_label_expose (GtkWidget      *widget,
                                                    x, y,
                                                    range,
                                                    1);
-
-          /* FIXME should use gtk_paint, but it can't use a clip
+         gdk_region_intersect (clip, event->region);
+ 
+         /* FIXME should use gtk_paint, but it can't use a clip
            * region
            */